moving things into classes