Prep for better message handling