merge here won't do anything at this time :)

I plan to switch to using the new trait instead, since it's based on this code in the first place anyway