First commit in trying to addonify this