all tests almost passing
more wip
wip