Added more binding, increased decoupleing, more to do