Add mixins. More demo work.