Annotation works, with some flaws, but can all be fixed. New xml doesn't get created yet.