Massive improvements to overall structure.