preparing modules for refactoring... i hope