Unfinished Segment store and model changes to SegmentRef