continued working on models and parsing