Leaving out aoi until the drawing routines are working.