Drawer

lets pull this logic out into a service (and replace the other instances where this check occurs)