Starting to structure the app slightly better