Work on 1.8 update

Still about 200 errors to fix