Finished phase 1
Working Version
Decorator
Additional stuff