Shortcuts

Implement shortcuts mentioned in #55 
It looks like we are using the same field for both a boolean and a controller. If we want a falsey value to check if this is set, I think `null` would  be more appropriate.