Working on the parser

I’m not certain where I’m going with this right now, but I have enough
to want to preserve what I’ve got.