Finally working on the app proper