Some more testing, and laying out of the app.  Not working yet.