First draft of Decorator pattern going in...