Moved stuff around. Ammend commit tomorrow.