WIP fixing provider things

Blerg, almost there.