Use project names instead of objects in controller
Greatly simplified broken logic