added todos, enhanced example code