Moved stuff around to organize