Initial attempt to move labels over to using annotations; not yet working