- Added TODO items for improved exception handling and trapping
- Added TODO items for increased logging to log facility