Changes to deliver first vaguely working version.  Further work will be needed to cover corner cases etc.
Add data to test annotation.