Expanding coverage of parser

And yet somehow simplifying it all the same.
Charging forth with a better parser