WIP - switching to parser centric structure