added drawing back, slight reorg
merge / change