changes to message class and some to peer class havent finished with peer yet