Mostly POD updates, some functionality