Week 2 Commit.

Everything is in Minus the overridden method.