more wip - so close