update TODO with re-arch idea