use new API from shell client
add TODO file