Experimenting with branches
Got a lot done. Almost all the basic data flow of the app is finished