Add TODO to else current_context