More progress towards finishing the app