Working on getting the dispatch modularized.