squash npes
initial impl of #835