graphics layer work, send results to listcontroller
fixed conflicts
Merge branch 'sam-berg-master'