Initial commit of bits from master.