adding some TODOs for tomorrow