Putting in the TODOs in the starting code