Added pops, almost done