Final commit for this terrible class.