Finished #10 and part of #9