Make a few variables local
Add TODO file
TODO update
TODO update