Interim delivery to Di. Included exception handling and some UI improvements.