Finish basic move of user event logic to RxJS