All done now.. Not too well organised though..