more functionality from phase 1
more test messages
cleanup comments, indenting, removed generic comments and removed dummy classes as we dont want to write tests for them