Changing a bunch of stuff for sprint3.