agpl
fixed up some object variable access errors in the dispatcher, test setup now passes, tests dont