updated with my additions to this assignment