Got Phase 2 completed and working

Corrected issues with Nil and other aspects of application