Feature/dispatcher flush

Rebased and branch renamed to include feature.