More massive overhauls

* One more massive overhaul commit will be the last one needed