Merge pull request #1 from fox-squirrels-2013/todo

now with data