Filled out some functions!