restructured apply_w_model - many features removed temp
restructured class methods