App actually runs now. Also refactoring.