re #6 alright, feature is done.