Changes to the application. Trying to get the databinding right between the two