hmm, separate into smaller apps?