WIP - inject conn info, and some api cleaning..