Pushing what I have as I shelve this plugin.