Moved things into classes.