Modifications to edge handling.  Getting very close.