merging with stashed changes from earlier
getting rid of puzfns altogether