Moved stuff around. Removed unnecessary stuff