made some progress on core classes