Add draw tools. Need to debug why they don't yet draw.