Merge the app.

So much work. Battered and broken fingers. No ability to comment.