Added Plugin Code, still a lot to do!