Worked on a balance of type- and instance- based plugin stuff