Moved everything out of general_resources