issue #1 done. Add TODO