revised TODO, added sample data