Began implementing decorator pattern