Working on adding tracks and segments in geometry