Refactor some things, use Project.from_name