Cleaned things up and have an first cut at underlying mechanisms
for annotations.