ugh
Move collision logic for a temp cycle fix