I must learn to commit more frequently so I don't forget what I've done
Added support for countryOfOrigin, closes #36, mammoth!