Huge POD rewrite