Initial fix for build issues on 3.13

I have currently stubbed out the proc stuff where it required larger rearchitecting. Do you have a view on the best path for this?