Initial Update to 1.8 (One error left - this does not build yet)