bar none

please review and merge