Work on drawer and Switches implementation. Should be generally OK