Halfway commit to fix editing issue for annotations
Merge branch 'ocd' of github.com:janastu/swtr into ocd