start refectoring of mark & add panel plugin