no I didn't do any TODOS but I will
Merge remote-tracking branch 'origin/master'
sqlite