All of this needs to be commented and have tests added before it can be merged IMO.  It's clear that some of this was nuanced -- so why not describe it more? :)