Add z-sorting to redraw
Add z-depth to bodies
Merge branch 'tweak-drawing'