GR 42 - restrict fields

@twinge, please review
Please remove debug logging before we merge.