Version 0.1

* Bring core code up to line with the spec in the wiki