Moved stuff into settings