Added most stuff needed