Filled out the basics