Several different things happening, should have committed separately.