Pulling in viperaus fork as branch to this.