added few TODOs for us