More internal cleanup/expansion. Working on annotate