#19 Rethinking connections
#19 Some more