added the rest of the tables, started on generateReport