Initial commit cont'd