Add drawing capability
Merge