Add Data and Action classes. Playing around with best (read in as few lines as code as possible) way to initiate them in a viewmodel