Work out the kinks in the app - especially updating several methods to function better