Stateful and uidraw

Слиты nikitronn запросил слияние stateful_and_uidraw в master

Created by: zeffii

various function can be refactored, but I want to be certain this works OK first.