First pass at converting echo to dispatcher