Adding the Final Decorators and Updated Test Code

Hell Yea, got the decorators working!
Merge branch 'Dan's-Code' of https://github.com/idoerg/biodigWSC into Dan's-Code