move some binds into entities