Big merge of modules, working PDF uploads