Removed the model and logic that I created in the last commit.  Doing it a bit differently.