Improved swimming
Binder role

More progress on the binder role