Parity Bugs 2

Not ready to merge.