Moved stuff and added stuff