Add todos, and tweak working folder