Add buggy collision detection for now, will try to fix later