tmp commit
Supported modifier and added testing for them.