Source drawing is now a separate call

This means it can be drawn on top of the contours.