beginning to convert some slapped together objects into proper classes