Stuff
Refactor and make project query more efficient