Did some cleanup.
More cleanup.
More cleanup.
Got integration tests passing.