Redoing annotator. I now have text working. Still need to do image annotations. #44