WIP : tweaks to how fitting works