Added queue math and improved find w/ tests