Did a bunch of stuff regarding message data structures and some other stuff