GR 42 - restrict fields

@twinge, please review
Yes, I would like to decide on this before merging.