Starting again. Too much unnecessary code