Initial pass at necessary changes to public plugin