Extensive changes to annotationFormatter.  Initial commit with commented out source.
Cleaned up old comments and commented source.