Works with classes too
took out the pyste stuff