Minor comments. Also reduced if/else.
Working at some required fields.
Working with required fields. Going to move logic into generic odm.