wip: more nan progress