Reworked a few more sections, only clustering left to go!
Merging.