Added default stubbish Connection and fixed some class scoping.