Finished up the homework