Make this read like a real 1.0

* This makes it ready for production
* This adds 1.0 features