resetting
disaster averted. lots of bug fixes. not sure how to push this back upstream.