major restructuring to better handle edge fuzzies