WIP on projects refactor