Core classes added, plus some test pages