Initial Commit cont'd