Commit for Sprint 2

This is as far as I will get for Sprint 2. Kim checking out!