source working
test working
properly
adding connection
needs testing though