Just worked further on the classes.