Setup script update

Its almost done