let-one working

many changes to work with new bindings