Added base drawing functions
Merged to current version