Finish move to Decorator

Finish move to more of a Decorator model