Updated for Homework #2, and part of Homework #3 model solutions