WIP: Missed a few fields in pod refactor

Yes, this is a naive implementation of conversion, but I wanted to prove the concept to make sure I understood the issue.