Added todo
Merge branch 'KevinC' into snickers