Far more refactoring, fixes to connection handling, rename to hatchet account