Vastly simplified class and optimized the pluck routine