rudimentary annotation support
refined a little on the annotations