Finished up assignment 3