More work on class restructure.