Cleaned up application + model implemented