add this == Rework to mixin functions. Closes #101