Once again some parser stuff. TDD rocks