Adding filled in table and total; need to parameterize queries now