Changed a bunch of stuff around.