Initial work

I believe I can do that in the annotation, I will take a look.