Finishing touches on initial plugin work