Refactor, add sample data