Other classes and changes needed for previous push to work.