WIP

Not sure where I am - went away for 2 weeks and forgot what I was doing.
oops.
Added some Control tests.
Decorator doesn't need to be abstract.