Serious Improvements

Gajan has made some major progress to your code.  Please approve