added all the basic shit