Basic merging done. 

Final changes to be done component wise.