#330 Initial mixin collection

Needs to be tested for bugs
#330 Fixed used mixins