Converting to use RxJava now that it's 1.0'd