Update TODO
Finishing off Settings