Working on splitting app into two parts: one for viewing, one for running