Improving boilerplate app.  Can't help myself.