Adding initial model support and firming up demo "app" a little