Yeah tests are failing, leaving my debug as is for now until my brain cools down or someone else tackles this.