Refactored away from the ProjectData, instead relying on . Also added some minor directives to improve UX