Further work on making more parser methods. Noted that branching does not work in a TODO.