Getting stuff working again post refactor