I'm too tired to write a commit message tonight. Also this is yucky and needs refactored. Also having decide-policy in two different places might be too confusing. WIP
CC: @aplazas @aperezdc @chturne