7 failing, code freshened up