Working on this. Redoing the whole thing, sorry.