First!
Refactor.
Cleanup.
Remove old app.