WIP on updated modeler