[WiP] Refactorin

Raw dump