Starting proper policy building

I can even add a comment about my changes.