BugFix:: Removed all instances of &$this, replaces with $this