Added initial drawing code