Update TODO w/ longer term architecture plan