Converted server side to use Observable layer

Also cleaned up client side observable layer