These will require different treatment later, so best only have one place where each method is called.
These use the internal 2D drawer. Not hooked up yet.