Complete second version of DiaDia.
Testing all classes.