WIP
working with then bind
Merge branch 'feature/prevent-double-bind'