Started work on the decorator