MVP 2

MVP 2, and part way through MVP 3. Currently running with a toast on
info window clisk.