Closes #233 using the dispatcher