Working version of app, before cleanup