Added the mixins
Some brushing up