Prelim commit
Some part done. Pushed on request of Girish