Going to do this in a separate PR and scope categories to projects at the same time