Start on classes and add tests for comments