Beginning of de-refactor due to :trollface: from @brandon-beacher