Added functionality for the mod function
Fixed merge conflicts
Actually fixed merge conflict