Bestiial refactor...