Final Commit

FInal commit having included all the code as per final point