Moved around variables and stuff.