Get first pass at annotation markup in place