Move connection back to main server
Add the npmaki support back in