Update to the project.  Now using an Application class to maintain application state