Module loading finally starting to look good