Made changes to 1-8 to make it work, need to fix 1-9.