First pass at using the mvvm/models.js Observable approach.
Update model to use correct event format
Minor typo/todo tweaks