Some restructuring, I am an idiot