Had to rename some functions that became non-static. Added some accessors to module static variables as needed.