Rejig stubs a little.
First hack at Thing.
TODO++