Beginning of a dispatch overhaul