Added plan, removed "done" where appropriate
Some preliminary work on getting this into shape
Fix typo in message