Working more on operators..changed a few subtle things to model classes