Waf graphics added
draw logics
merge