Completed v1 - Fully Working
Missed MainViewModel commit