Added to view and split startup into seperate classes.