Refactoring and adding new project. For reals, this time.