added some TODOs for remind