Initial code checkin... work in progress.