Week 2 Commit 4

Feature 1 & 10 accomplished