wip passing tests
more wip