finished adding everything to separate classes