More mixins and many improvements…