We got this far

Reverting to working code