hooked up signalr
merge