Filled out the bare-bones functions