Transferring more to view model/config