Finishing up v1. Adding content type to view models, and finishing the annotation listener