Update TODO with ready items
Implement error checks using schema