WIp
Resolved merge conflicts
Merge pull request #10 from ajaswal/policies

WIp