Added TODOs delineating goals for the rest of the project.