Start working on deferred modules.
Reorganized static functions a bit...