Finished the rest of #3