Fixed view catch
Undid stuff
Redid that stuff