Ianjorgensen/suspend draw

@jebeck