Refactoring
Factoring out Specific table generation into their own classes