Added TODO list and shortened example