Started work on #130 . Refactored mixins storage and variables should be
working.