upgrading kit_model/_presenter to work with new workflow (2)