Segment support & legacy migration

Not strictly, but I'm going to leave this one in to make it clear its resolving it in Owl.