been fighting CSS rules
refactoring using Visitors for Model updates