Working on object models for easier parsing

In progress, not connected