move things to classes