Moved Everything into classes.