GR 42 - restrict fields

@twinge, please review
Makes for an even more complex test, but OK