Improve example code, add TODO