Major refactor commenced. IO innards gouged.