Start to add sweeper functionality