Work on drawer features