First run at better requests for #6
Old class names