Change output to view model / strategy approach. WIP