Finished up app.  Needs refactoring