Lots of changes
Added mixins
Added mixins
Added mixins