WIP: Added Rx and some more refactorings