WIP: continue the decoration