Fixes heinous bug in Decorator implementation.

Also updates interface to prepare for another decorator.
Adds storage decorator
Updates copyright year