more examples and updated todo