WIP Adding res case (but not res provider yet)