Added remaining code (minus some key files that have connection strings in)