added some TODO at the top of Client