#55: More integration work with rx