refactoring to install at load time
again, dammit