Expnd local data thing to also contain the message