cleaned up my disaster, refactored associations for project and user