wip, more tests passing