add TODOs for client package