WIP: Add sweeper check