Working on the Core classes and data.