Major plugin overhaul part 2.