Branch looks good now, collisions work