Week 4 Commit 20

Completed Code, pre-debug