update draw function

implemented most recent draw function from delimiters branch. This is
not the most complete branch