Working Version of Week 2's assignment