Rewrote service to do Rx