Label development

Ready to merge but some outstanding fields that can be worked on