WIP  All modules can compile with these changes