More skeleton.
Expand decorator pattern.