Cleaned up Segment.cs and add segment motion