Added initial work to branch
Attached the patch.
Need some reviews on the re...