Fixes to structured approach to application.