completed decorators
done merging
merged staff