Usage Updates

Not ready for production.