refactored to camel
changing setters to model
about to perform logic updates with refactoring plus retiming controller