wip, tidying