Still errors with null application reference in window
Application works as user selectable CLI or UI
Merge branch 'develop'