Added more people lists and moved table generator into a bespoke class.