Add new data file.  Rework to more RxJava-like.  Remove unnecessary implementations.
Remove unused data files.