Added all the stuff i forgot the first time.