Add collision testing