Code for nup now in there, bound to break
Seems to be close to working; data dependent errors