Starting on redoing the whole setup