moving things to classes