Started on the rest of init
Fixed comment