Numerous Changes

Plenty of changes here. Needed to tighten it up, and add a try/except
loop.