Modules

Check code for FIXMEs.