[WIP] More fit checks