All green, some cleanup. Needs double-serialisation sorted