Continues dev on svgs and enums