Cleaned up more and renamed to 'moviequery'