Removed the "testing" bi-directional functionality until it's more tested