updates to new mixins (wip)