Feature/project setup 2