General parsing structure in place, needs test suite.