Gone as far as I could in testing ... main development complete