Feature/courtagen 109 more tables in portal

Resolving this branch on Brian's behalf