Added some soln structure plus some initial test connectivity code