Added remaining loading code, signal source/sinks code