Working on #22. Making the changes to the labels.