Added TODO re: dynamic totals