Untested class changes (part 1)