Commit before re-write to proper RxJava classes