Get specs passing
Extract field-related code into separate module