Allow for multiple projects
Refactor based on PR feedback