Added TODO comments.
Renamed dataServices to hotsheetServices for consistency.
Removed a TODO item.