I2c stuff rebased

Please pull.