Switched some sections around and removed some stuff.