Changed Message.java to use ArrayList
Merged Message.java