modify methods to use new classes. replace some args with class variables.