add TODO items for possible optimizations