Strip more code out.
Bring in Sahara code, start to use it for the object constructions. More tests passing now.