Intermediate commit.  Saving work on model and helper.