Fixes to make this first cut work successfully.

Still no docs :(