initial label work
fixing merge conflicts