Introduce Segments
Remove obsolete class
Refactor axis code
Big pond view