Preliminary commit #2.