Major refactor, removed much of the Rx.