More revamping of fitting class, almost done