few more tests passing

Progress... I think this is still in the direction that @ElBrogrammer was going, at least beginning to get things back to passing before further gutting