Initial Plugin Code
Merge branch 'phase4'