Add some more TODO notes
Start to set date for shift