Added some todos to reflect what we discussed