Coming up next, testing this large block of changed collision code