still wip - unit tests taking ages