Going to rewrite these classes.