More work on pickling! Seems to be working better...
Oops, missed this file...