WIP: Refactor internal API for Pods to match v1beta3

I will remove the above block of code if no longer relevant.  It doesn't seem to be.