Add super slow implementation from samples
Merge branch 'Jon'