Added some TODO comments to remind me what to do next.