Haxed to not give tags to fragile aspects in funny cases
Pickle update.  See TODO about moving pkls to 'production'