More work on parser, not functional yet. Getting there.