Version 2 0 features

Submitting for the full V2.0 feature set.