master: Moving things around. Tests are compilable, now on to fixing the DBCP connector, which is (as expected) horribly broken. Lots left to do, but now that framework is built can move forward using TDD.