no more hacked code to get NA into missingness
more progress on solution