Have a few tests failing still, hence the WIP. I'll drop the WIP once they're all passing.
cc: @jenatali @karolherbst @daniels @cwabbott0