Added all the basics