Working on converting to mixins