Refactor model to address

Lots of other changes
Changed cursor handout process