Switch to Java 7
Add message objects and unit tests