Updating to 1.8.

Major architectural improvements.