Rework provider

major overhaul, version bump