make tests pass
fix up specs, clean a few other things learned from integration
WIP. finally got where working