Worked a bit on the messaging protocol