Major improvements to item annotation

Almost done wrapping up property annotation