start of work on the TODOs