Made a few changes to allow tests to test, and began MP parsing.