Ensure instance of Project
Make it DRY
Make things prettier