Totally refactored the app structure and greatly simplified the app.  Removed extra redundant files.