All new modules tested, ready to merge.