My architecture is less full of fuck now