Moved a bit of stuff around.