a bit more re-arranging
added the decorator demos...