No longer need to base it off of my fork as my changes have been merged in to upstream sandbar.
I don't have the time to split this commit