More work on the Drawer