In progress.

* Updates to plugin handler scope
* Fixing the basePath stuff