Added TODO list and shortened the example