Extended draw function

Not working completely yet