Refactoring app, starting dev