databinding attempt
merge conflicts resolved