bridgegap commit

keep the changes while i run back to master to fix a horrendous bug
Revert "bridgegap commit"

This reverts commit fd87914bdb3a15a92cba54ce7624824da1932281.