Updated with new totals. Not complete.