WIP: basic parser structure added