moved shit around, sorted out connection