Smichz

More testing, more fixing, more mixins, more clarity.