Began final aspects of functionality