Work on model, no graphics changes