ok, great. will wait a little while for any other feedback in General, and then merge.