Started correcting the misunderstood decorator patter
Correcting the misunderstood decorator pattern to mixin patter
Correcting the misunderstood decorator pattern to mixin patter
some fixes