Add new modules

Targeting release for last minute stuff, will land to master later today.