2nd pass - now moving more of that stuff over to the model