Week 4 Commit 7

Final code Pre-debug