Continued work on new structure. Currently at a stuck point.

I need to find a better way to display the variation segments in the
result table to allow for map cell adding and just general improvement
of extendability.
Missed stuff from previous commit.

NOTE: App is not currentlly compilable and there are many errors to fix.