Refactored Drawer to OldDrawer
Refactor pt 2