Integrate Andy's latest updates and add his plugins