Properly skip fields - there were invalid fields getting in and skip didn't work directly on the model