pulled a few last functions out of the modules;