separate drawing from core maybe