wip: unpacking now appears to sort of work too