classes need remapping big time, and so does js