Intermediary commit - finally making some headway