Moving a class local for the time being