Commit 2 : Several Changes

Several Changes made - product in Pre - Alpha stage