Stateful and uidraw

Created by: zeffii

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