Added comment support. In the middle of adding scoring support.