This breaks the dupe string, but apart from that, yeah, I think these are probably all gonna need a revisit.