Adds minimal logic to get dispatcher working