Voiding behavior changes

this is the start, don't merge yet. I need to see if anything else needs added to this