added all the basics