hurray! did some work on the plugin me and @hishaman are collaborating on