Lots of work on initial app