Update to 1.8

Some things commented out
Trying to find out how to get things to work
Update to 1.8 (2)