re-adding files for comments

Decorator pattern well implemented, although I wouldn't document the method saying it's a decorator. I'd use a separate class hierarchy instead and propose a semantically relevant naming convention.