add stuff for receiving messages
merging!