This is the one!!

This is the one that appears to work 100% and fixes the bugs that I encountered with the pre-fork version.

Please hammer on it, and if you find any conditions that fail, let's get a test written for it and figure it out!