Starting to make mixins more generic