Tweaks and placeholders before we launch the code
Added placeholders for the modules we still need to document
Fix merge conflict