Sprint3

Pulling in some changes that got missed off of sprint2.