Added comment walker, content, and other stuff