Started to add model, improved XAML binding