moved globals into a class