Initial code changes

Pairing with rahul b