Started work on a (new) parser