getting the structure of the app correct, lots of changes