RandomMixins

Using mixins to fix some bugs