Started on a brilliant redesign, if I do say so myself, but not quite there. Tests failing