Changed the entire structure to make it model view viewModel, Not working but much more clear