Initital framework
Fixed funny merge conflict of turning one project into another