flash messaging refactor (WIP / DO NOT MERGE)