Moved stuff around properly.