Beginning new parser, also slowly segregating different code.