'Final' version

This is the application that resulted from the changes made during the
demo.