All features working, now let's refactor...