Moved stuff around. Removed some stuff.