WIP: tests + fixes + love

Is this going to cause problems?