Partially built up connection logic.
Added a utility and tests for utility methods.
Simplified architecture.