Transform/mixin

Mixin now integrated, all tests pass.