Results From The Laser-Wire At Atf2 And Development Of A Fibre Laser For Its Upgrade