Version 2.0

Completed Draft.