Refactoring the parser. Currently errors out while parsing the inside of a block.