Squash new mixin functionality
Merge branch 'feature/mixins2'