Finishing up FIltering Hopper re-write