Removed "this" from functions, breaks mixins
Merges from branch and tests are now running again.