WIP Commit - restructuring app, still needs a lot of work.