Dispatch Refactoring, resolves issues #105, 106

Dispatch Refactoring, resolves issues #105, 106