BLD-468: Fix bugs.
Refactor bindTo.
Reoeder methods.