Progress on moving to new plugin api. #10