wip: all tests passing