Finished out MVVM pattern refactor to work with x instead of page.