Major overhaul of project setup and soon to change all of main functions