Moved stuff around, added more things