Contextual comments

- Attributes now have a comment field