More steps towards functionality.