Some minor refactoring and some new normal binds.