add TODO comments
use new res