DrawManager now functionable
merge