Allow override of loading
Load a dist from config
Fixup i386
Add more functionality