added all the basic things