Initial Merge

First working version of plugin code with framework.