Probably related to my refactor. Dang