Almost done 2.1, done 2.2. Need to finish extraction of People