More Changes, trying to get project setup