Now returning proper results! Woo!