more work on model stuff