Updates to mixins & JS
Ignoring