Working on drawing functionality