big messy work-in-progress (but it does connect) commit