Closes #11

But does raise other ideas.  Will create issues for them.