Sunday: tests, better class structure, cleaner main