Drawing samples

IMHO it was time to get this code pulled out of the commands...