Add the proper collision code, not tested