WIP: Move ModTable to be global. More test code.