Wip/parsing

Some early parsing additions, no real code.