Started work on method parser

Some code cleanup