Finalized the mother of all refactors