Finalize module work, merging to master soon.