More v1.1 stuffs

The line count of the diff is misleading. The actual code changes are small. The bloated line count is because I moved the pod around. You can review easier by looking at the specific commits.