Restructured Messenger.java, more comments, buggy