Initial checkin of Astra branch.