Class scans and confirms are now superficially working