Continue refactoring of trackapp