presumably working collision

i'm starting some more tests on it now, but so far it looks good