[WIP] Reactive View Model Refactoring & Testing