WIP for review

This has a bunch of ideas I'll document inline
This allows chaining through the setter and back to the Policy