Working spec with improved error checking, fields now read in from src folder