Another near-rewrite
Loads
Oh no! More changes.