Task & source file to add sample data, plus bug fixes