apparently I never committed any of this a year ago...