Initial Commit. Migration to OO in progress.