Unify general_site and general (will split up differently later)