Adding class annotations and 'override'.

Both additions currently just ignore the annotations.