Sandhya, I must admit that the work you're putting into ETP1.1 would probably be better served being put into ETP2. If you're interested in helping out with finishing off that code, I'm sure there is some stuff that you can do.
Once ETP2 would be done, I think that your efforts in finishing off your project would come much easier.
