Restructured app, much simpler now.