Minor restructuring. The app is broken with this push, due to W.I.P.