working on mixins, breaking and fixing bugs