dropping handy as default since it doesn't build anymore
Fixing up unpack function