Cleaned up parameter passing - all secure.
Review all try/except blocks.
Last commit before Phase 4.