3rd Month Week 7 

Merge request from first half of week 7. Unable to diagnose rspec issues.