Mixin refactor

gets testing started