Fix up and switch to MassStash land