Big steps to making the class maintenance screen work...