BUG:  Wasn't painting using the correct order.