added mixins back in, passes tests