Starting to move styles to the object model as well