Can I port checkodesol in another PR, or would you prefer it being done in this one itself?