Better, spotted some mistakes, still not quite working.