More things and whatnot. I think there's another test, also starting to add support for hits