Added modulus basic framework
Merged