Added TODO comments as clues of things that still need to happen.