made stuff into classes